Autogenerated HTML docs for v1.5.3.4-203-gcc61a
diff --git a/git-config.html b/git-config.html index 5f353cb..770de75 100644 --- a/git-config.html +++ b/git-config.html
@@ -1116,6 +1116,17 @@ </p> </dd> <dt> +branch.<name>.mergeoptions +</dt> +<dd> +<p> + Sets default options for merging into branch <name>. The syntax and + supported options are equal to that of <a href="git-merge.html">git-merge(1)</a>, but + option values containing whitespace characters are currently not + supported. +</p> +</dd> +<dt> clean.requireForce </dt> <dd> @@ -1297,6 +1308,29 @@ </p> </dd> <dt> +gc.auto +</dt> +<dd> +<p> + When there are approximately more than this many loose + objects in the repository, <tt>git gc --auto</tt> will pack them. + Some Porcelain commands use this command to perform a + light-weight garbage collection from time to time. Setting + this to 0 disables it. +</p> +</dd> +<dt> +gc.autopacklimit +</dt> +<dd> +<p> + When there are more than this many packs that are not + marked with <tt>*.keep</tt> file in the repository, <tt>git gc + --auto</tt> consolidates them into one larger pack. Setting + this to 0 disables this. +</p> +</dd> +<dt> gc.packrefs </dt> <dd> @@ -1561,7 +1595,7 @@ <dd> <p> Controls which merge resolution program is used by - <a href="git-mergetool.html">git-mergetool(l)</a>. Valid values are: "kdiff3", "tkdiff", + <a href="git-mergetool.html">git-mergetool(1)</a>. Valid values are: "kdiff3", "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and "opendiff". </p> </dd> @@ -1907,7 +1941,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 15-Sep-2007 07:45:30 UTC +Last updated 03-Oct-2007 12:03:44 UTC </div> </div> </body>
